From: Daniel van Vugt Date: Wed, 4 Feb 2026 11:11:57 +0000 (+0800) Subject: Refresh patches and fix conflicts X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~40 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3326dd6410d63536cf57c9c0afbee4a16ab55d96;p=gnome-shell.git Refresh patches and fix conflicts --- diff --git a/debian/changelog b/debian/changelog index 42640042d..f12b37c9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ gnome-shell (50~alpha-1) UNRELEASED; urgency=medium * New upstream release: 50.alpha + * Refresh patches and fix conflicts: + - Revert-main-Register-session-with-GDM-on-startup.patch + - Revert-tests-Fail-on-warnings-too.patch -- Daniel van Vugt Wed, 04 Feb 2026 16:21:27 +0800 diff --git a/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch b/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch index 6cccdb2d7..2502fe79c 100644 --- a/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch +++ b/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch @@ -18,10 +18,10 @@ Bug-Debian: https://bugs.debian.org/1126174 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/ui/main.js b/js/ui/main.js -index bd39063..4a011f2 100644 +index 90e78a1..c911ab2 100644 --- a/js/ui/main.js +++ b/js/ui/main.js -@@ -335,8 +335,6 @@ async function _initializeUI() { +@@ -323,8 +323,6 @@ async function _initializeUI() { extensionManager = new ExtensionSystem.ExtensionManager(); extensionManager.init(); @@ -30,12 +30,12 @@ index bd39063..4a011f2 100644 if (sessionMode.isGreeter && screenShield) { layoutManager.connect('startup-prepared', () => { screenShield.showDialog(); -@@ -383,6 +381,8 @@ async function _initializeUI() { +@@ -371,6 +369,8 @@ async function _initializeUI() { sessionMode.currentMode !== 'initial-setup') _handleLockScreenWarning(); + LoginManager.registerSessionWithGDM(); + if (perfModule) { - let perfOutput = GLib.getenv('SHELL_PERF_OUTPUT'); + const perfOutput = GLib.getenv('SHELL_PERF_OUTPUT'); Scripting.runPerfScript(perfModule, perfOutput); diff --git a/debian/patches/debian/Revert-tests-Fail-on-warnings-too.patch b/debian/patches/debian/Revert-tests-Fail-on-warnings-too.patch index f4a358a78..19d6ddbc6 100644 --- a/debian/patches/debian/Revert-tests-Fail-on-warnings-too.patch +++ b/debian/patches/debian/Revert-tests-Fail-on-warnings-too.patch @@ -8,10 +8,10 @@ This reverts commit 207b9bb3c0a582b830218fd1b6e8760684adbc48. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build -index d710516..082cb91 100644 +index b9b4f31..96b42c1 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -96,7 +96,7 @@ libgvc_path = fs.parent(libgvc.get_variable('libgvc').full_path()) +@@ -102,7 +102,7 @@ libgvc_path = fs.parent(libgvc.get_variable('libgvc').full_path()) background_file = join_paths(meson.current_source_dir(), 'data', 'background.png') shell_testenv = environment()